From 6e8bc2eca119d9ab9f8a09753463922483ccb226 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Sun, 4 May 2008 22:26:34 +0000
Subject: [PATCH] Bump version to 1.3.5 for release.  W00t!

---
 chkdoc            |  2 +-
 configure         |  2 +-
 configure.in      |  2 +-
 gbversion.h       |  2 +-
 internal_styles.c | 70 +++++++++++++++++++++++------------------------
 5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/chkdoc b/chkdoc
index f16444efd..d57a2b7a8 100755
--- a/chkdoc
+++ b/chkdoc
@@ -12,7 +12,7 @@ checkit() {
 		ECODE=1
 	fi
 	
-	if ! grep -qi $TYPE  ~/src/babelweb/changes.html
+	if ! grep -qi $TYPE  ~/src/babelweb/changes*.html
 	then
 		echo $STY $TYPE is not documented in changes.html.
 		ECODE=1
diff --git a/configure b/configure
index 261ac2789..ba89b6b49 100755
--- a/configure
+++ b/configure
@@ -1746,7 +1746,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Increase GBBUILD for a new release
 GBBUILD=16
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20080305"
+# PACKAGE_RELEASE="-beta20080305"
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_RELEASE "$PACKAGE_RELEASE"
diff --git a/configure.in b/configure.in
index 759bc5133..15982033c 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(GPSBabel, 1.3.5, BUG-REPORT-ADDRESS)
 # Increase GBBUILD for a new release
 GBBUILD=16
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20080305"
+# PACKAGE_RELEASE="-beta20080305"
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)
 
diff --git a/gbversion.h b/gbversion.h
index e7a13d1b4..070161cad 100644
--- a/gbversion.h
+++ b/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.3.5-beta20080305"
+#define VERSION "1.3.5"
 #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.3.5"
diff --git a/internal_styles.c b/internal_styles.c
index 74ec1b754..b370c6e90 100644
--- a/internal_styles.c
+++ b/internal_styles.c
@@ -999,6 +999,40 @@ static char tomtom_itn[] =
 "IFIELD	SHORTNAME, \"\", \"%s\"\n"
 "IFIELD	CONSTANT, \"0\", \"%s\"\n"
 ;
+static char xmap[] = 
+"# gpsbabel XCSV style file\n"
+"#\n"
+"# Format: DeLorme Xmap Conduit\n"
+"# Author: Alex Mottram\n"
+"#   Date: 12/09/2002\n"
+"#\n"
+"# \n"
+"# As defined in csv.c/xmap\n"
+"#\n"
+
+"DESCRIPTION		DeLorme XMap HH Native .WPT\n"
+"EXTENSION		wpt\n"
+
+"#\n"
+"# FILE LAYOUT DEFINITIIONS:\n"
+"#\n"
+"FIELD_DELIMITER		COMMASPACE\n"
+"RECORD_DELIMITER	NEWLINE\n"
+"BADCHARS		COMMA\n"
+
+"PROLOGUE	BEGIN SYMBOL\n"
+"EPILOGUE	END\n"
+"#\n"
+"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
+"#\n"
+"IFIELD	LAT_HUMAN_READABLE, \"\", \"%08.5f\"\n"
+"IFIELD	LON_HUMAN_READABLE, \"\", \"%08.5f\"\n"
+"IFIELD	DESCRIPTION, \"\", \"%s\"\n"
+
+"OFIELD	LAT_DECIMAL, \"\", \"%08.5f\"\n"
+"OFIELD	LON_DECIMAL, \"\", \"%08.5f\"\n"
+"OFIELD	DESCRIPTION, \"\", \"%s\"\n"
+;
 static char xmap2006[] = 
 "# gpsbabel XCSV style file\n"
 "#\n"
@@ -1037,40 +1071,6 @@ static char xmap2006[] =
 
 
 
-;
-static char xmap[] = 
-"# gpsbabel XCSV style file\n"
-"#\n"
-"# Format: DeLorme Xmap Conduit\n"
-"# Author: Alex Mottram\n"
-"#   Date: 12/09/2002\n"
-"#\n"
-"# \n"
-"# As defined in csv.c/xmap\n"
-"#\n"
-
-"DESCRIPTION		DeLorme XMap HH Native .WPT\n"
-"EXTENSION		wpt\n"
-
-"#\n"
-"# FILE LAYOUT DEFINITIIONS:\n"
-"#\n"
-"FIELD_DELIMITER		COMMASPACE\n"
-"RECORD_DELIMITER	NEWLINE\n"
-"BADCHARS		COMMA\n"
-
-"PROLOGUE	BEGIN SYMBOL\n"
-"EPILOGUE	END\n"
-"#\n"
-"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
-"#\n"
-"IFIELD	LAT_HUMAN_READABLE, \"\", \"%08.5f\"\n"
-"IFIELD	LON_HUMAN_READABLE, \"\", \"%08.5f\"\n"
-"IFIELD	DESCRIPTION, \"\", \"%s\"\n"
-
-"OFIELD	LAT_DECIMAL, \"\", \"%08.5f\"\n"
-"OFIELD	LON_DECIMAL, \"\", \"%08.5f\"\n"
-"OFIELD	DESCRIPTION, \"\", \"%s\"\n"
 ;
 static char xmapwpt[] = 
 "# gpsbabel XCSV style file\n"
@@ -1104,7 +1104,7 @@ static char xmapwpt[] =
 "IFIELD	IGNORE, \"\", \"%-.31s\"\n"
 "IFIELD	DESCRIPTION, \"\", \"%-.78s\"\n"
 ;
-style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "xmap2006", xmap2006 } , { "tomtom_itn", tomtom_itn } , { "tomtom_asc", tomtom_asc } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } ,  {0,0}};
+style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap2006", xmap2006 } , { "xmap", xmap } , { "tomtom_itn", tomtom_itn } , { "tomtom_asc", tomtom_asc } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } ,  {0,0}};
 size_t nstyles = 30;
 #else /* CSVFMTS_ENABLED */
 style_vecs_t style_list[] = {{0,0}};
-- 
2.30.2